Use g_return_val_if_fail where return value needed.

https://bugzilla.gnome.org/show_bug.cgi?id=710987

diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c
index 3588fa22dadfc4bbb60fdf239150d258ca16658c..1537864b758c915bcded2955f03ea7a2760a4823 100644 (file)
--- a/gtk/gtkactionmuxer.c
+++ b/gtk/gtkactionmuxer.c
@@ -887,8 +887,8 @@ gtk_print_action_and_target (const gchar *action_namespace,
 {
   GString *result;
 
-  g_return_if_fail (strchr (action_name, '|') == NULL);
-  g_return_if_fail (action_namespace == NULL || strchr (action_namespace, '|') == NULL);
+  g_return_val_if_fail (strchr (action_name, '|') == NULL, NULL);
+  g_return_val_if_fail (action_namespace == NULL || strchr (action_namespace, '|') == NULL, NULL);
 
   result = g_string_new (NULL);
 

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index ccd49ec5f1c7087433b13fd1cc72c26c9fda9f90..d8af4a06f509dbd9971d2ca55e7ec819dd73a42b 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -2170,8 +2170,8 @@ gtk_application_get_accels_for_action (GtkApplication *application,
   gchar *action_and_target;
   gchar **accels;
 
-  g_return_if_fail (GTK_IS_APPLICATION (application));
-  g_return_if_fail (detailed_action_name != NULL);
+  g_return_val_if_fail (GTK_IS_APPLICATION (application), NULL);
+  g_return_val_if_fail (detailed_action_name != NULL, NULL);
 
   action_and_target = normalise_detailed_name (detailed_action_name);
   accels = accels_get_accels_for_action (&application->priv->accels, action_and_target);

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index b76931e86813bdee4098624a1b8c6effd0cd7985..c6b6b2577a9237584a0b635d5cb977664fa26cdd 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -2568,7 +2568,7 @@ gtk_builder_set_application (GtkBuilder     *builder,
 GtkApplication *
 gtk_builder_get_application (GtkBuilder *builder)
 {
-  g_return_if_fail (GTK_IS_BUILDER (builder));
+  g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
 
   if (!builder->priv->application)
     {